From a311bd64977f4a4a8f09ce35ceca80bc427ac5f6 Mon Sep 17 00:00:00 2001 From: tsteven4 Date: Sat, 1 Dec 2018 08:03:37 -0700 Subject: [PATCH] remove obsolete msvc workarounds. (#278) msvc 2012 and earlier are not supported. They didn't support c++14 anyway which we currently require. --- defs.h | 17 ----------------- v900.cc | 4 ---- 2 files changed, 21 deletions(-) diff --git a/defs.h b/defs.h index 068faf289..b0df8e743 100644 --- a/defs.h +++ b/defs.h @@ -112,15 +112,6 @@ # define strdup _strdup #endif -/* Workaround for lack of va_copy in Visual Studio 2012 and earlier */ -#if __WIN32__ -# if _MSC_VER -# if _MSC_VER < 1700 -# define va_copy(dest, src) ((dest) = (src)) -# endif -# endif -#endif - /* Turn off numeric conversion warning */ #if __WIN32__ # if _MSC_VER @@ -1081,14 +1072,6 @@ QString rot13(const QString& s); signed int si_round(double d); -#if _MSC_VER -//These functions are not included in the MS pre C99 implementation, use internal implementation -//This asssumes that non-_MSC_VER includes math.h (all should include defs.h) -#define round si_round -#define lround si_round -#endif - - /* * Protypes for Endianness helpers. */ diff --git a/v900.cc b/v900.cc index 0b35ba1d1..775b9633c 100644 --- a/v900.cc +++ b/v900.cc @@ -76,10 +76,6 @@ for a little more info, see structures: #include #include // atoi -#if _MSC_VER -#define __func__ __FUNCTION__ -#endif - /* the start of each record (line) is common to both advanced and basic mode. it will be parsed by a single common code. hence, it will be easier and clearer to have a common structure for it. -- 2.30.2